build with GTK_DISABLE_DEPRECATED.

2008-06-17  Michael Natterer  <mitch@imendio.com>

	* gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED.

	* gtk/gtkclist.c
	* gtk/gtkcombo.c
	* gtk/gtkctree.c
	* gtk/gtklist.c
	* gtk/gtklistitem.c
	* gtk/gtkoldeditable.c
	* gtk/gtkpixmap.c
	* gtk/gtktext.c
	* gtk/gtktipsquery.c
	* gtk/gtktree.c
	* gtk/gtktreeitem.c: whenever we #undef GTK_DISABLE_DEPRECATED and
	actually use deprecated symbols (not just types or macros),
	#define it again before #include "gtkalias.h" so the symbols match
	and the beast links.

svn path=/trunk/; revision=20433

diff --git a/ChangeLog b/ChangeLog
index 3c302e5a80f8eb97adef45828d3140abdafd29af..6299643c7803eda48cb8a3475646b2b09375f4a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED.
+
+       * gtk/gtkclist.c
+       * gtk/gtkcombo.c
+       * gtk/gtkctree.c
+       * gtk/gtklist.c
+       * gtk/gtklistitem.c
+       * gtk/gtkoldeditable.c
+       * gtk/gtkpixmap.c
+       * gtk/gtktext.c
+       * gtk/gtktipsquery.c
+       * gtk/gtktree.c
+       * gtk/gtktreeitem.c: whenever we #undef GTK_DISABLE_DEPRECATED and
+       actually use deprecated symbols (not just types or macros),
+       #define it again before #include "gtkalias.h" so the symbols match
+       and the beast links.
+
 2008-06-17  Paolo Borelli  <pborelli@katamail.com>
 
        * gtk/tests/recentmanager.c: more tests for GtkRecentManager.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a6739f73a17f9ebf674350b99821bd0ee9b1fa08..41cd8ca5fdd4c15c149bedb0a6e234aafdb4c9ce 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -35,6 +35,7 @@ INCLUDES =                                            \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
+       -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
        $(GTK_DEBUG_FLAGS)                              \

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 58297816c4a9873aab363e36ad09b926ec979397..ced0671dce1bfb08f2b1b544e0b0b1ea15fe5f1f 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -25,14 +25,17 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GDK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-
 #include <config.h>
 
 #include <stdlib.h>
 #include <string.h>
 
+#undef GDK_DISABLE_DEPRECATED
+
+#include <gdk/gdkkeysyms.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkmain.h"
 #include "gtkobject.h"
 #include "gtkctree.h"
@@ -41,7 +44,8 @@
 #include "gtkdnd.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include <gdk/gdkkeysyms.h>
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 /* length of button_actions array */

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 552b738bb6b60c31be102af5b0a35fa0c00b7976..ed60e5a9538f28f80258003d4ff4677a175f2470 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -33,6 +33,8 @@
 #include <config.h>
 #include <string.h>
 
+#include <gdk/gdkkeysyms.h>
+
 #include "gtkarrow.h"
 #include "gtklabel.h"
 #include "gtklist.h"
@@ -43,11 +45,12 @@
 #include "gtkscrolledwindow.h"
 #include "gtkmain.h"
 #include "gtkwindow.h"
-#include "gdk/gdkkeysyms.h"
 #include "gtkcombo.h"
 #include "gtkframe.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 static const gchar gtk_combo_string_key[] = "gtk-combo-string-value";

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 16d10741034627c6cb8f1d5a56897a6b3fe272f9..5df4e0d9a99aaf1ac9dc69893dd6b06110223530 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -40,6 +40,8 @@
 #include "gtkdnd.h"
 #include "gtkintl.h"
 #include <gdk/gdkkeysyms.h>
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define PM_SIZE                    8

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index f78b4f38752266b551309c7c510c7d820c7b4d71..e862541d6e563c5b8cb1864ae2460caaf23372ae 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -36,6 +36,8 @@
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {

diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 000fa960ffea907d82db397917e640bde59ce8a7..d6e7915b7f46869ca7285ec1d5bc75654a0736ac 100644 (file)
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -24,9 +24,12 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
+
+#include <gdk/gdkkeysyms.h>
+
 #undef GTK_DISABLE_DEPRECATED
 
-#include <config.h>
 #include "gtkbindings.h"
 #include "gtklabel.h"
 #include "gtklistitem.h"
@@ -34,7 +37,8 @@
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
-#include <gdk/gdkkeysyms.h>
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index 43c66e91b38a5340c18e5838010122393730af3b..840a20107b0b7f05e6fe361f517491a264e570aa 100644 (file)
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -37,6 +37,8 @@
 #include "gtkselection.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define MIN_EDITABLE_WIDTH  150

diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c
index bee47809d2e3cbb458e52447a10d1b9622c6085a..74ea04de267dbac4a2693381009604f528f2e969 100644 (file)
--- a/gtk/gtkpixmap.c
+++ b/gtk/gtkpixmap.c
@@ -35,6 +35,8 @@
 #include "gtkcontainer.h"
 #include "gtkpixmap.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index e39279ca567d9500d3b835acbf31ffa180974e45..6bcab8afc004951ef978f687e3f219fa6a9d2d06 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -24,14 +24,18 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GDK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-
 #include <config.h>
+
 #include <ctype.h>
 #include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdki18n.h"
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkselection.h"
@@ -43,6 +47,8 @@
 #include "line-arrow.xbm"
 #include "gtkprivate.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index beef45602828460d9100fe03801ef9322c281039..95586e4da7fd2309fe9cbebd6e744a18ff75e0a6 100644 (file)
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -29,13 +29,15 @@
 
 #undef GTK_DISABLE_DEPRECATED
 
-#include       <config.h>
-#include       "gtktipsquery.h"
-#include       "gtksignal.h"
-#include       "gtktooltips.h"
-#include       "gtkmain.h"
-#include        "gtkmarshalers.h"
-#include       "gtkintl.h"
+#include <config.h>
+#include "gtktipsquery.h"
+#include "gtksignal.h"
+#include "gtktooltips.h"
+#include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index a0731de3069eec86674bbf0c53d3ba24be8ff538..d34ce7c0194d03c7e664bbdd87f121a89b43024e 100644 (file)
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -36,6 +36,8 @@
 #include "gtktree.h"
 #include "gtktreeitem.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 enum {

diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index b82914e59b0617867b3bcf97fd061f39ba61e9d7..c75040467990635a66147ce3e9a51f923706ec2c 100644 (file)
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -27,6 +27,7 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
+
 #include "gtklabel.h"
 #include "gtkeventbox.h"
 #include "gtkpixmap.h"
@@ -37,6 +38,8 @@
 #include "gtktree.h"
 #include "gtktreeitem.h"
 #include "gtkintl.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #include "tree_plus.xpm"